Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Dec 2011 08:03:32 +0000 (00:03 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Dec 2011 08:03:32 +0000 (00:03 -0800)

Trivial merge